83f2deb64e13e28f2e42365ca073ca22c98ef3e1,grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/config/JpaMappingConfigurationStrategy.java,JpaMappingConfigurationStrategy,getPersistentProperties,#PersistentEntity#MappingContext#ClassMapping#boolean#,36

Before Change



            Class<?> propertyType = descriptor.getPropertyType();

            if(getAnnotation(readMethod, field, Id.class) != null) {
                persistentProperties.add( propertyFactory.createIdentity(entity, context, descriptor));
            }
            else if(getAnnotation(readMethod, field, EmbeddedId.class) != null) {
                persistentProperties.add( propertyFactory.createIdentity(entity, context, descriptor));
            }
            else if (getAnnotation(readMethod, field, Embedded.class) != null) {
                if (isCollectionType(propertyType)) {
                    final Association association = establishRelationshipForCollection(descriptor, field, entity, context, true);
                    if (association != null) {

After Change


            else if(hasAnnotation(readMethod, field, EmbeddedId.class)) {
                persistentProperties.add( propertyFactory.createIdentity(entity, context, descriptor));
            }
            else if (hasAnnotation(readMethod, field, Embedded.class)) {
                if (isCollectionType(propertyType)) {
                    final Association association = establishRelationshipForCollection(descriptor, field, entity, context, true);
                    if (association != null) {